Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

STARS #131

Merged
merged 13 commits into from
Mar 11, 2024
Merged

STARS #131

merged 13 commits into from
Mar 11, 2024

Conversation

AndroBetel
Copy link
Contributor

@AndroBetel AndroBetel commented Mar 1, 2024

allows marines to do the cool fulton extraction to a dropship in flyby, requested by amory the gm
also adds an electronics attachment point to midway

2024-03-01.23-17-24.mp4

it has more sound than in the video

Copy link

github-actions bot commented Mar 4, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

code/game/objects/items/misc.dm Show resolved Hide resolved
code/game/objects/items/misc.dm Show resolved Hide resolved
code/modules/admin/verbs/shuttlepanel.dm Outdated Show resolved Hide resolved
@morrowwolf
Copy link
Member

Also conflicts and make sure the electronic slots look right in game. Undraft after testing on server.

@morrowwolf morrowwolf marked this pull request as draft March 4, 2024 19:15
@morrowwolf morrowwolf added the needs tested testmerge this to see what breaks label Mar 4, 2024
Copy link

github-actions bot commented Mar 4, 2024

Conflicts have been resolved. A maintainer will review the pull request shortly.

@AndroBetel
Copy link
Contributor Author

people no longer drop their stuff on the ground

@AndroBetel AndroBetel marked this pull request as ready for review March 8, 2024 13:38
@morrowwolf morrowwolf merged commit 30d32db into cmss13-devs:master Mar 11, 2024
33 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs tested testmerge this to see what breaks Sprites
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants